Auto merge of #3657 - Keruspe:rust-1.16.0, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 6 Feb 2017 20:31:45 +0000 (20:31 +0000)
committerbors <bors@rust-lang.org>
Mon, 6 Feb 2017 20:31:45 +0000 (20:31 +0000)
ensure libressl compatibility

like #3644 but for the rust-1.16.0 branch


Trivial merge